auto merge of #1036 : brson/cargo/flakeywindows, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 11 Dec 2014 23:28:54 +0000 (23:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 11 Dec 2014 23:28:54 +0000 (23:28 +0000)

Trivial merge